Move 'debug' build option into the outermost Config.mk file.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/Config.mk b/Config.mk
index 180f932fc1dfeec874d67717339dc619713a6f5f..a7c975d2bc0c242ec52001dfcd5a92ade4b4aaae 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -1,5 +1,8 @@
 # -*- mode: Makefile; -*-
 
+# A debug build of Xen and tools?
+debug ?= n
+
 # Currently supported architectures: x86_32, x86_64
 XEN_COMPILE_ARCH    ?= $(shell uname -m | sed -e s/i.86/x86_32/)
 XEN_TARGET_ARCH     ?= $(XEN_COMPILE_ARCH)
@@ -9,6 +12,14 @@ XEN_TARGET_X86_PAE  ?= n
 HOSTCC     = gcc
 HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
 
+ifneq ($(debug),y)
+# Optimisation flags are overridable
+CFLAGS    ?= -O3 -fomit-frame-pointer
+CFLAGS    += -DNDEBUG
+else
+CFLAGS    += -g
+endif
+
 AS         = $(CROSS_COMPILE)as
 LD         = $(CROSS_COMPILE)ld
 CC         = $(CROSS_COMPILE)gcc

diff --git a/tools/blktap/Makefile b/tools/blktap/Makefile
index 6f19e79f3fd5d5867f4edfce4abf7e8e97976986..d4019c0252b63c68931389570d2b8acb3e1a5721 100644 (file)
--- a/tools/blktap/Makefile
+++ b/tools/blktap/Makefile
@@ -24,8 +24,6 @@ SRCS     += blktaplib.c xenbus.c blkif.c
 
 CFLAGS   += -Werror
 CFLAGS   += -Wno-unused
-#CFLAGS   += -O3
-CFLAGS   += -g3
 CFLAGS   += -fno-strict-aliasing
 CFLAGS   += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 # get asprintf():

diff --git a/tools/blktap/parallax/Makefile b/tools/blktap/parallax/Makefile
index d2cc0ee6244e315e308dd34c51f4c48581825dde..a6a0c0a3f89338a90f9dc38af5155f8b4caeb633 100644 (file)
--- a/tools/blktap/parallax/Makefile
+++ b/tools/blktap/parallax/Makefile
@@ -33,8 +33,6 @@ VDI_TOOLS += vdi_validate
 
 CFLAGS   += -Werror
 CFLAGS   += -Wno-unused
-#CFLAGS   += -O3
-CFLAGS   += -g3
 CFLAGS   += -fno-strict-aliasing
 CFLAGS   += $(INCLUDES)
 CFLAGS   += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE

diff --git a/tools/blktap/ublkback/Makefile b/tools/blktap/ublkback/Makefile
index d6083478e9a0dea283fceec09279674fd941c9f9..6915d2f523128455fff1e5e5a3300a9cca246d2d 100644 (file)
--- a/tools/blktap/ublkback/Makefile
+++ b/tools/blktap/ublkback/Makefile
@@ -11,8 +11,6 @@ INSTALL_DIR  = /usr/sbin
 
 CFLAGS   += -Werror
 CFLAGS   += -Wno-unused
-#CFLAGS   += -O3
-CFLAGS   += -g3
 CFLAGS   += -fno-strict-aliasing
 CFLAGS   += -I $(XEN_LIBXC)
 CFLAGS   += $(INCLUDES) -I.

diff --git a/tools/console/testsuite/Makefile b/tools/console/testsuite/Makefile
index 33ae3c1618d6b688946e4b6d8955a52f9bb12935..2deb7d43d6ca2ea6053cfbce2cb6a419c77fb71c 100644 (file)
--- a/tools/console/testsuite/Makefile
+++ b/tools/console/testsuite/Makefile
@@ -1,5 +1,6 @@
-CFLAGS=-g -Wall
-CC=gcc
+XEN_ROOT = ../../..
+include $(XEN_ROOT)/tools/Rules.mk
+
 LDFLAGS=-static
 
 all: console-dom0 console-domU procpipe

diff --git a/tools/debugger/libxendebug/Makefile b/tools/debugger/libxendebug/Makefile
index 17088021160952602c95c3183145a2042cf7af3d..d0a90e12679485a011259dfbf0b183900690b891 100644 (file)
--- a/tools/debugger/libxendebug/Makefile
+++ b/tools/debugger/libxendebug/Makefile
@@ -7,14 +7,12 @@ INSTALL_DIR   = $(INSTALL) -d -m0755
 MAJOR    = 3.0
 MINOR    = 0
 
-CC       = gcc
-
 XEN_ROOT = ../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 SRCS     := xendebug.c
 
-CFLAGS   += -Werror -O3 -fno-strict-aliasing
+CFLAGS   += -Werror -fno-strict-aliasing
 CFLAGS   += $(INCLUDES) -I. -I$(XEN_ROOT)/tools/libxc
 # Get gcc to generate the dependencies for us.
 CFLAGS   += -Wp,-MD,.$(@F).d

diff --git a/tools/firmware/acpi/Makefile b/tools/firmware/acpi/Makefile
index 29b7f4dd5b25b2a3044f72a39ef866d678fa3fa7..26d932fbeaa9effca24b033c5e9f584c18f2e527 100644 (file)
--- a/tools/firmware/acpi/Makefile
+++ b/tools/firmware/acpi/Makefile
@@ -16,11 +16,12 @@
 # *
 # */
 #
+
+XEN_ROOT = ../../..
+include $(XEN_ROOT)/tools/Rules.mk
+
 # Compiler flag
-CFLAG=-I. -I../../libxc
-       
-# Compiler tool        
-CC=gcc
+HOSTCFLAGS += -I. -I../../libxc
 
 # TARGET
 C_SRC=$(shell ls *.c)
@@ -33,7 +34,7 @@ IASL_URL=http://developer.intel.com/technology/iapc/acpi/downloads/$(IASL_VER).t
 
 vpath iasl $(PATH)
 all:$(ACPI_BIN)
-       
+
 acpi_dsdt.c:acpi_dsdt.asl
        $(MAKE) iasl
        iasl -oa -tc acpi_dsdt.asl
@@ -54,15 +55,13 @@ iasl:
        install $(IASL_VER)/compiler/iasl /usr/bin/iasl
 
 $(ACPI_GEN):$(C_SRC) $(H_SRC) acpi_dsdt.c
-       $(CC) -o $(ACPI_GEN) $(CFLAG) $(shell ls *.c)
+       $(HOSTCC) -o $(ACPI_GEN) $(HOSTCFLAGS) $(shell ls *.c)
 
 $(ACPI_BIN):$(ACPI_GEN)
        ./$(ACPI_GEN) $(ACPI_BIN)
-       
+
 clean:
        rm -rf *.o $(ACPI_GEN) $(ACPI_BIN) $(IASL_VER) 
-#   rm -f acpi_dsdt.c
        rm -rf  $(IASL_VER).tar.gz
-install:all
-               
-       
+
+install: all

diff --git a/tools/ioemu/Makefile b/tools/ioemu/Makefile
index bf3deef77b5806a3ee1632cd482d569b7e4130aa..09c69c77ec2b76e5714a4dfef6b6ef145b5959e6 100644 (file)
--- a/tools/ioemu/Makefile
+++ b/tools/ioemu/Makefile
@@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk
 
 -include config-host.mak
 
-CFLAGS+=-O2 -g -fno-strict-aliasing 
+CFLAGS+=-g -fno-strict-aliasing 
 ifdef CONFIG_DARWIN
 CFLAGS+= -mdynamic-no-pic
 endif

diff --git a/tools/ioemu/configure b/tools/ioemu/configure
index c50ce360b6d85c6d0e9225d92dd4bdfd1596cf70..89e7d0d7625e22b0c1a0646b6cab2f3f6cd7e48a 100755 (executable)
--- a/tools/ioemu/configure
+++ b/tools/ioemu/configure
@@ -392,17 +392,17 @@ echo "docdir=$docdir" >> $config_mak
 echo "configdir=$configdir" >> $config_mak
 echo "LIBDIR=$libdir" >> $config_mak
 echo "#define CONFIG_QEMU_SHAREDIR \"$datadir\"" >> $config_h
-echo "MAKE=$make" >> $config_mak
-echo "CC=$cc" >> $config_mak
-if test "$have_gcc3_options" = "yes" ; then
-  echo "HAVE_GCC3_OPTIONS=yes" >> $config_mak
-fi
-echo "HOST_CC=$host_cc" >> $config_mak
-echo "AR=$ar" >> $config_mak
-echo "STRIP=$strip -s -R .comment -R .note" >> $config_mak
-echo "CFLAGS=$CFLAGS" >> $config_mak
-echo "LDFLAGS=$LDFLAGS" >> $config_mak
-echo "EXESUF=$EXESUF" >> $config_mak
+#echo "MAKE=$make" >> $config_mak
+#echo "CC=$cc" >> $config_mak
+#if test "$have_gcc3_options" = "yes" ; then
+#  echo "HAVE_GCC3_OPTIONS=yes" >> $config_mak
+#fi
+#echo "HOST_CC=$host_cc" >> $config_mak
+#echo "AR=$ar" >> $config_mak
+#echo "STRIP=$strip -s -R .comment -R .note" >> $config_mak
+#echo "CFLAGS=$CFLAGS" >> $config_mak
+#echo "LDFLAGS=$LDFLAGS" >> $config_mak
+#echo "EXESUF=$EXESUF" >> $config_mak
 
 if test "$bigendian" = "yes" ; then
   echo "WORDS_BIGENDIAN=yes" >> $config_mak

diff --git a/tools/ioemu/target-i386-dm/Makefile b/tools/ioemu/target-i386-dm/Makefile
index 40f68a10f6f4e399894dd40e2d9d63eb1aaad456..3400621cefdcbf39a26f88a38f09746fa592ee0a 100644 (file)
--- a/tools/ioemu/target-i386-dm/Makefile
+++ b/tools/ioemu/target-i386-dm/Makefile
@@ -13,7 +13,7 @@ ifdef CONFIG_USER_ONLY
 VPATH+=:$(SRC_PATH)/linux-user
 DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
 endif
-CFLAGS+=-O2 -g -fno-strict-aliasing
+CFLAGS+=-g -fno-strict-aliasing
 LDFLAGS=-g
 LIBS=
 HELPER_CFLAGS=$(CFLAGS)
@@ -99,7 +99,6 @@ LDFLAGS+=-static
 endif
 
 ifeq ($(ARCH),i386)
-CFLAGS+=-fomit-frame-pointer
 OP_CFLAGS=$(CFLAGS) -mpreferred-stack-boundary=2
 ifeq ($(HAVE_GCC3_OPTIONS),yes)
 OP_CFLAGS+= -falign-functions=0 -fno-gcse

diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index 3ec4c05d4e77f252dba662a8c45546e31e4ccbf1..67cdf207f1b7a113c0a97fef09a7063450396d7a 100644 (file)
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -7,8 +7,6 @@ INSTALL_DIR     = $(INSTALL) -d -m0755
 MAJOR    = 3.0
 MINOR    = 0
 
-CC       = gcc
-
 XEN_ROOT = ../..
 include $(XEN_ROOT)/tools/Rules.mk
 
@@ -49,7 +47,6 @@ BUILD_SRCS += xc_hvm_build.c
 endif
 
 CFLAGS   += -Werror
-CFLAGS   += -O3
 CFLAGS   += -fno-strict-aliasing
 CFLAGS   += $(INCLUDES) -I.
 

diff --git a/tools/misc/Makefile b/tools/misc/Makefile
index 70f8e9c675f56d0807bd550f2e71503be68e6383..003947c8e31e60e2df8e44c2033c770f0c8f400e 100644 (file)
--- a/tools/misc/Makefile
+++ b/tools/misc/Makefile
@@ -5,7 +5,7 @@ INSTALL_DIR     = $(INSTALL) -d -m0755
 XEN_ROOT=../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-CFLAGS   += -Werror -O3 
+CFLAGS   += -Werror
 
 INCLUDES += -I $(XEN_XC)
 INCLUDES += -I $(XEN_LIBXC)

diff --git a/tools/misc/cpuperf/Makefile b/tools/misc/cpuperf/Makefile
index 86b9c185feb9c5a4ea5c4097ab6051c6f6ce526d..185660efcb537d7f76c8c7083a8369f4dca87170 100644 (file)
--- a/tools/misc/cpuperf/Makefile
+++ b/tools/misc/cpuperf/Makefile
@@ -17,8 +17,6 @@ INSTALL_DIR   = $(INSTALL) -d -m0755
 XEN_ROOT=../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-CFLAGS      += -O3 
-
 HDRS         = $(wildcard *.h)
 SRCS         = $(wildcard *.c)
 OBJS         = $(patsubst %.c,%.o,$(SRCS))

diff --git a/tools/misc/lomount/Makefile b/tools/misc/lomount/Makefile
index eed0c66951c021d3d268e28d14ef911ee729496f..1a47c0b45fb75919331fdfe1c7e497de9397b282 100644 (file)
--- a/tools/misc/lomount/Makefile
+++ b/tools/misc/lomount/Makefile
@@ -6,7 +6,7 @@ INSTALL_DATA    = $(INSTALL) -m0644
 XEN_ROOT=../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-CFLAGS  += -Werror -O3
+CFLAGS  += -Werror
 
 HDRS     = $(wildcard *.h)
 OBJS     = $(patsubst %.c,%.o,$(wildcard *.c))

diff --git a/tools/misc/mbootpack/Makefile b/tools/misc/mbootpack/Makefile
index d87aa8a838cedf23ecc23e46095a976d1cb72243..3c6791e4ee6f2d5c3c2ea6ed2585e2b671a643ea 100644 (file)
--- a/tools/misc/mbootpack/Makefile
+++ b/tools/misc/mbootpack/Makefile
@@ -21,9 +21,7 @@ INCS  := -I. -I-
 DEFS   := 
 LDFLAGS        := 
 CFLAGS += -Wpointer-arith -Wcast-qual -Wno-unused -Wno-format
-CFLAGS += -Wmissing-prototypes
-#CFLAGS        += -pipe -g -O0 -Wcast-align
-CFLAGS += -pipe -O3 
+CFLAGS += -Wmissing-prototypes -pipe
 
 #  What object files need building for the program
 OBJS   := mbootpack.o buildimage.o

diff --git a/tools/security/Makefile b/tools/security/Makefile
index ea12a8114749519f4737346f6e5580871a1dd68b..75646c6f4696c15deb35e212f1c39eb5ee2c2fa6 100644 (file)
--- a/tools/security/Makefile
+++ b/tools/security/Makefile
@@ -2,7 +2,6 @@ XEN_ROOT = ../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS   += -Werror
-CFLAGS   += -O3
 CFLAGS   += -fno-strict-aliasing
 CFLAGS   += -I.
 

diff --git a/tools/vnet/libxutil/Makefile b/tools/vnet/libxutil/Makefile
index f6a5ca07803da18bd92e58d5d7185360af6b4b50..8ace83e55436948fa8542ed100af6b1575ddc6a2 100644 (file)
--- a/tools/vnet/libxutil/Makefile
+++ b/tools/vnet/libxutil/Makefile
@@ -29,7 +29,7 @@ LIB_SRCS += util.c
 LIB_OBJS := $(LIB_SRCS:.c=.o)
 PIC_OBJS := $(LIB_SRCS:.c=.opic)
 
-CFLAGS   += -Werror -O3 -fno-strict-aliasing -g
+CFLAGS   += -Werror -fno-strict-aliasing
 
 # Get gcc to generate the dependencies for us.
 CFLAGS   += -Wp,-MD,.$(@F).d

diff --git a/tools/vnet/vnetd/Makefile b/tools/vnet/vnetd/Makefile
index 93482fa41975bad90398b6a6f1c4262ab2edf499..74a3d07b40083cb35992934be531cc5beefa686c 100644 (file)
--- a/tools/vnet/vnetd/Makefile
+++ b/tools/vnet/vnetd/Makefile
@@ -42,8 +42,6 @@ CPPFLAGS += -D USE_GC
 CPPFLAGS += -D __ARCH_I386_ATOMIC__
 
 #----------------------------------------------------------------------------
-CFLAGS += -g
-CFLAGS += -O2
 CFLAGS += $(INCLUDES) $(LIBS)
 
 LDFLAGS += $(LIBS)

diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile
index 5bf5f3d68a6a817b5e98b5b130d007d4565500eb..9907dfa0c5dc2db9063e88c6640f50af991bac40 100644 (file)
--- a/tools/xcutils/Makefile
+++ b/tools/xcutils/Makefile
@@ -19,7 +19,7 @@ PROGRAMS_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin
 
 INCLUDES += -I $(XEN_LIBXC)
 
-CFLAGS += -Werror -O3 -fno-strict-aliasing
+CFLAGS += -Werror -fno-strict-aliasing
 CFLAGS += $(INCLUDES)
 
 # Make gcc generate dependencies.

diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index a024be0ae97a2ae366c993deb45b444d21795178..70877eff8a63d8866636bfd4f992e41f8d374891 100644 (file)
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -12,7 +12,7 @@ BASECFLAGS=-Wall -g -Werror
 # Make gcc generate dependencies.
 BASECFLAGS += -Wp,-MD,.$(@F).d
 PROG_DEP = .*.d
-BASECFLAGS+= -O3 $(PROFILE)
+BASECFLAGS+= $(PROFILE)
 #BASECFLAGS+= -I$(XEN_ROOT)/tools
 BASECFLAGS+= -I$(XEN_ROOT)/tools/libxc
 BASECFLAGS+= -I.

diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
index 8179695fb52159e5ceaad58ee2d0feb83bce4938..1d66129c8ddff348ae84d006eeaa1e1a61b7ca91 100644 (file)
--- a/tools/xentrace/Makefile
+++ b/tools/xentrace/Makefile
@@ -6,7 +6,7 @@ INSTALL_DATA    = $(INSTALL) -m0644
 XEN_ROOT=../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-CFLAGS  += -Werror -O3
+CFLAGS  += -Werror
 
 CFLAGS  += -I $(XEN_XC)
 CFLAGS  += -I $(XEN_LIBXC)

diff --git a/xen/Rules.mk b/xen/Rules.mk
index 8fbae5270fe217b48d897391f05bd628823632da..2ece51a8897abd7b2a740e00e6c8fdcace9f60e3 100644 (file)
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -4,7 +4,6 @@
 # 'make clean' before rebuilding.
 #
 verbose     ?= n
-debug       ?= n
 perfc       ?= n
 perfc_arrays?= n
 crash_debug ?= n
@@ -47,12 +46,7 @@ include $(BASEDIR)/arch/$(TARGET_ARCH)/Rules.mk
 
 CFLAGS += -g -D__XEN__
 
-ifneq ($(debug),y)
-CFLAGS += -DNDEBUG
-ifeq ($(verbose),y)
-CFLAGS += -DVERBOSE
-endif
-else
+ifneq ($(debug)$(verbose),nn)
 CFLAGS += -DVERBOSE
 endif
 

diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index 0cf48cd5da6cf2dabffa8031e692920b20d7b0e9..66cddd1577825f145655fd14e22efa2b2002d728 100644 (file)
--- a/xen/arch/x86/Rules.mk
+++ b/xen/arch/x86/Rules.mk
@@ -14,10 +14,6 @@ CFLAGS  += -I$(BASEDIR)/include
 CFLAGS  += -I$(BASEDIR)/include/asm-x86/mach-generic
 CFLAGS  += -I$(BASEDIR)/include/asm-x86/mach-default
 
-ifneq ($(debug),y)
-CFLAGS  += -O3 -fomit-frame-pointer
-endif
-
 # Prevent floating-point variables from creeping into Xen.
 CFLAGS  += -msoft-float